feat: 完成SubAgent DAG调度器并修复infra稳定性 by Cai-Tang-www · Pull Request #317 · 1024XEngineer/neo-code

Cai-Tang-www · 2026-04-16T01:52:45Z

关联

Closes #275

本次改动

1) SubAgent 调度器落地（issue #275）

新增 Task DAG 调度器：依赖阻塞/解锁、并发上限、预算超时、失败重试与放弃。
支持 Todo 领取与回写：claim -> in_progress -> completed/failed/canceled。
增加调度可观测事件（queued/claimed/running/completed/retry_scheduled/failed/canceled/blocked/finished）。
新增调度相关测试矩阵：DAG 校验、依赖解锁、并发限制、重试策略、revision 冲突与取消回写。

2) Todo 模型增强（服务调度器回写）

扩展 Todo 字段：retry_count、retry_limit、next_retry_at。
补齐 Session Todo 更新逻辑与测试覆盖。

3) Infra 稳定性修复（顺带修复全量测试失败）

统一跨平台剪贴板图片不支持错误常量，修复编译失败。
修复 image MIME 识别分支：保留扩展名 MIME，同时避免 application/octet-stream 抢占魔数识别。
SaveImageToTempFile 支持 TMPDIR，补齐对应失败路径。

验证

已执行：go test ./...
结果：通过

codecov · 2026-04-16T01:54:42Z

Codecov Report

❌ Patch coverage is 83.77049% with 99 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
internal/subagent/scheduler.go	78.28%	62 Missing and 34 partials ⚠️
internal/subagent/scheduler_graph.go	96.29%	1 Missing and 1 partial ⚠️
internal/tui/infra/image.go	83.33%	0 Missing and 1 partial ⚠️

📢 Thoughts on this report? Let us know!

fennoai

I found 3 issues worth fixing before merge (2 high, 1 medium): role trust boundary/role drift, missing cancellation on scheduler error exits, and retry failure reason being wiped during blocked state.

fennoai · 2026-04-16T01:58:39Z

+// defaultRoleSelector 生成默认角色选择器：优先读取 owner_id 中的合法角色，否则回退默认角色。
+func defaultRoleSelector(defaultRole Role) RoleSelector {
+	return func(todo agentsession.TodoItem) Role {
+		candidate := Role(todo.OwnerID)


defaultRoleSelector treats todo.OwnerID as trusted role input. OwnerID is task data and mutable, so this allows role injection (security boundary issue). It also conflicts with ClaimTodo writing runtime worker IDs into OwnerID, causing retry attempts to silently change role selection. Role should come from trusted scheduler policy/config, not persisted task owner metadata.

fennoai · 2026-04-16T01:58:39Z

+		s.sortReadyTasks(ready, state.readySince)
+
+		started, err := s.startReadyTasks(ctx, ready, state)
+		if err != nil {


On non-context errors from collectReadyTasks/startReadyTasks, Run returns immediately without canceling already-running tasks (state.running). That can leave todos stuck in in_progress and drop outcome writeback. Consider canceling/marking running tasks before returning on these error paths, same as the ctx.Err()/handleOneOutcome branches.

fennoai · 2026-04-16T01:58:39Z

 	}

-	if item.Status != TodoStatusFailed {
+	if item.Status != TodoStatusFailed && item.Status != TodoStatusPending {


This normalization clears FailureReason for blocked todos, but scheduler retry logic writes FailureReason while setting status=blocked (handleTaskFailure). The reason is erased immediately, so retry state loses failure context. Either preserve reason for blocked or store retry reason separately.

Cai-Tang-www · 2026-04-16T02:01:05Z

/code 帮我修复review,然后解决test覆盖率问题

fennoai · 2026-04-16T02:01:12Z

完成情况

已按你的要求修复 review 问题并处理覆盖率缺口，变更已推送到当前 PR 分支 feat(todo)。

已修复问题

internal/subagent/scheduler_types.go

修复默认角色选择信任边界：defaultRoleSelector 不再读取 todo.OwnerID，仅使用调度器可信默认角色。

internal/subagent/scheduler.go

修复调度循环异常路径：当 collectReadyTasks / startReadyTasks 返回非上下文错误时，先执行 cancelRunningTodos，避免运行中任务遗留为 in_progress。

internal/session/todo.go

修复失败原因丢失：blocked 状态不再清空 FailureReason，保留重试失败上下文。

测试与覆盖率

新增/调整测试文件：
- internal/subagent/scheduler_test.go
- internal/session/todo_test.go
本地验证：go test ./... 通过。
关键覆盖率提升（本地 go test -coverprofile）：
- internal/subagent/scheduler.go: 79.5% -> 85.4%
- internal/subagent/scheduler_executor.go: 85.7% -> 100.0%
- internal/subagent/scheduler_graph.go: 95.0% -> 100.0%
- internal/subagent/scheduler_types.go: 96.3% -> 100.0%
- internal/session/todo.go: 82.8% -> 89.7%

提交信息

Commit: b74c29d
已推送到：Cai-Tang-www/neo-code:feat(todo)

未执行项：未直接访问 Codecov 平台复核 patch 百分比（本地已完成覆盖率回归验证）。

View job run

- remove default role derivation from todo owner metadata - cancel running tasks when scheduler loop exits on internal errors - preserve blocked todo failure reason for retry diagnostics - add coverage for scheduler/session error and edge branches Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www · 2026-04-16T02:17:55Z

解决冲突
@xgopilot

fennoai · 2026-04-16T02:18:01Z

处理结果

已按“解决冲突”完成修复并推送到当前 PR 分支 feat(todo)。

本次修改

对齐并合并 origin/main 与当前分支在以下冲突代码块的语义：
internal/tui/infra/clipboard_common.go
internal/tui/infra/image.go
internal/tui/infra/infra_test.go
关键处理点：
TMPDIR 使用 strings.TrimSpace 后再传入 os.CreateTemp
图片 MIME 识别优先 image/* 扩展名，魔数判断保持 gif/webp 分支完整，兜底返回 detected
剪贴板回退测试兼容 nil 或 errClipboardImageUnsupported 两种合法结果

验证

已执行：go test ./...
结果：全部通过

提交与推送

Commit: dd2cc37
Push: HEAD:feat(todo)

未执行项：未进行额外功能改动（仅处理冲突相关代码与测试对齐）。

View job run

… detection Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www · 2026-04-16T02:29:28Z

/code 继续解决冲突

fennoai · 2026-04-16T02:29:36Z

处理结果

已继续完成冲突修复，并推送到当前 PR 分支 feat(todo)。

本次修改

修复冲突文件：internal/tui/infra/clipboard_common.go
调整 SaveImageToTempFile 中 pattern 分支后的空行布局，使其与 origin/main 同段改动可自动合并，消除三方合并冲突。

验证

已执行：go test ./...
结果：通过
额外校验：基于 origin/main 的三方合并模拟已无冲突标记

提交与推送

Commit: 867dfda
Push: HEAD -> feat(todo)

未执行项

未做额外功能改动（仅处理冲突消解）。

View job run

Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www added 2 commits April 16, 2026 09:52

feat: 实现subagent任务DAG调度器与重试回写

51faee6

fix: 修复infra跨平台剪贴板与图片MIME识别

7796ff1

fennoai Bot reviewed Apr 16, 2026

View reviewed changes

fix(infra): resolve main-branch merge conflicts in clipboard and mime…

dd2cc37

… detection Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

fix(infra): resolve remaining clipboard merge conflict

867dfda

Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www self-assigned this Apr 16, 2026

phantom5099 merged commit 24ec17c into 1024XEngineer:main Apr 16, 2026
2 checks passed

Cai-Tang-www deleted the feat(todo) branch April 19, 2026 17:01

fennoai Bot mentioned this pull request Apr 24, 2026

风险点计算 #313

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: 完成SubAgent DAG调度器并修复infra稳定性#317

feat: 完成SubAgent DAG调度器并修复infra稳定性#317
phantom5099 merged 5 commits into
1024XEngineer:mainfrom
Cai-Tang-www:feat(todo)

Cai-Tang-www commented Apr 16, 2026

Uh oh!

codecov Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

fennoai Bot left a comment

Uh oh!

fennoai Bot Apr 16, 2026

Uh oh!

fennoai Bot Apr 16, 2026

Uh oh!

fennoai Bot Apr 16, 2026

Uh oh!

Cai-Tang-www commented Apr 16, 2026

Uh oh!

fennoai Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

Cai-Tang-www commented Apr 16, 2026

Uh oh!

fennoai Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

Cai-Tang-www commented Apr 16, 2026

Uh oh!

fennoai Bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Cai-Tang-www commented Apr 16, 2026

关联

本次改动

1) SubAgent 调度器落地（issue #275）

2) Todo 模型增强（服务调度器回写）

3) Infra 稳定性修复（顺带修复全量测试失败）

验证

Uh oh!

codecov Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

fennoai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

fennoai Bot Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

fennoai Bot Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

fennoai Bot Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

Cai-Tang-www commented Apr 16, 2026

Uh oh!

fennoai Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

完成情况

已修复问题

测试与覆盖率

提交信息

Uh oh!

Cai-Tang-www commented Apr 16, 2026

Uh oh!

fennoai Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

处理结果

本次修改

验证

提交与推送

Uh oh!

Cai-Tang-www commented Apr 16, 2026

Uh oh!

fennoai Bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

处理结果

本次修改

验证

提交与推送

未执行项

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov Bot commented Apr 16, 2026 •

edited

Loading

fennoai Bot commented Apr 16, 2026 •

edited

Loading

fennoai Bot commented Apr 16, 2026 •

edited

Loading

fennoai Bot commented Apr 16, 2026 •

edited

Loading